Adding automatic API fallback, with minor refactor#141
Open
Cruuncher wants to merge 1 commit intoMicroPyramid:masterfrom
Open
Adding automatic API fallback, with minor refactor#141Cruuncher wants to merge 1 commit intoMicroPyramid:masterfrom
Cruuncher wants to merge 1 commit intoMicroPyramid:masterfrom
Conversation
Cruuncher
commented
Aug 2, 2023
Comment on lines
+103
to
+109
| class CurrencyRatesForexAPI(CurrencyRatesBase): | ||
| def _source_url(self): | ||
| return "https://theforexapi.com/api/" | ||
|
|
||
| class CurrencyRatesExchangeRateHost(CurrencyRatesBase): | ||
| def _source_url(self): | ||
| return "https://api.exchangerate.host/" |
Author
There was a problem hiding this comment.
These intermediate classes allow for defining multiple providers, and overriding the implementation slightly for each one
Cruuncher
commented
Aug 2, 2023
Comment on lines
+124
to
+127
| self.providers = [ | ||
| CurrencyRatesForexAPI(*args, **kwargs), | ||
| CurrencyRatesExchangeRateHost(*args, **kwargs) | ||
| ] |
Author
There was a problem hiding this comment.
Defines list of providers to try in order
Cruuncher
commented
Aug 2, 2023
Comment on lines
+42
to
+44
| # def test_get_rates_in_future(self): | ||
| # future = datetime.date.today() + datetime.timedelta(days=1) | ||
| # self.assertRaises(RatesNotAvailableError, get_rates, 'USD', future) |
Author
There was a problem hiding this comment.
These tests just don't work. It appears the current API allows sending a future date and will just treat it as current. Commenting them out for now
Cruuncher
commented
Aug 2, 2023
|
|
||
| def test_with_valid_currency_code(self): | ||
| self.assertEqual(str(get_symbol('USD')), 'US$') | ||
| self.assertEqual(str(get_symbol('USD')), '$') |
Author
There was a problem hiding this comment.
This didn't match the data in the currencies.json file
Cruuncher
commented
Aug 2, 2023
Comment on lines
+90
to
+101
| use_decimal = False | ||
| if isinstance(amount, Decimal): | ||
| use_decimal = True | ||
| else: | ||
| use_decimal = self._force_decimal | ||
| elif self._force_decimal: | ||
| raise DecimalFloatMismatchError("Decimal is forced. Amount must be Decimal") | ||
|
|
||
| if base_cur == dest_cur: # Return same amount if both base_cur, dest_cur are same | ||
| if use_decimal: | ||
| return Decimal(amount) | ||
| return float(amount) | ||
| return amount | ||
|
|
||
| rate = self.get_rate(base_cur, dest_cur, date_obj=date_obj, use_decimal=use_decimal) | ||
|
|
||
| return rate * amount |
Author
There was a problem hiding this comment.
convert now relies on get_rate rather than reimplementing the API call.
Logic is just overall simpler now
Cruuncher
commented
Aug 2, 2023
Comment on lines
+111
to
+118
| def get_rates(self, base_cur, date_obj=None): | ||
| date_str = self._get_date_string(date_obj) | ||
| payload = {'base': base_cur, 'symbols': dest_cur, 'rtype': 'fpy'} | ||
| payload = {'base': base_cur, 'rtype': 'fpy'} | ||
| source_url = self._source_url() + date_str | ||
| response = requests.get(source_url, params=payload) | ||
| response = self._request(source_url, params=payload) | ||
| if response.status_code == 200: | ||
| rate = self._get_decoded_rate( | ||
| response, dest_cur, use_decimal=use_decimal, date_str=date_str) | ||
| if not rate: | ||
| raise RatesNotAvailableError("Currency {0} => {1} rate not available for Date {2}.".format( | ||
| source_url, dest_cur, date_str)) | ||
| try: | ||
| converted_amount = rate * amount | ||
| return converted_amount | ||
| except TypeError: | ||
| raise DecimalFloatMismatchError( | ||
| "convert requires amount parameter is of type Decimal when force_decimal=True") | ||
| rates = self._decode_rates(response,date_str=date_str, base_cur=base_cur) | ||
| return rates |
Member
|
thank you @Cruuncher this is awesome contribuion ihave been waiting for. We will review and release ASAP. |
Author
|
@ashwin31 Let me know if there's any changes you'd like! The text of some exceptions may be different with this change |
|
Could anyone merge this? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In this PR, we implement the ability for the API to automatically fallback to alternate APIs so that the probability of availability is higher. Adding new providers should be easy enough with this change